From cd5cded430c37fcb57d0ecc03f8fdf2fdbe12c54 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 8 Apr 2020 15:30:46 +0100 Subject: [PATCH] Do not install GSK headers for missing backends Broadway and Vulkan renderers are optional; if GTK hasn't been built with their GSK renderers, we should not install their headers. --- gsk/meson.build | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gsk/meson.build b/gsk/meson.build index 8aeae9e7e8..0b1d0d7b3f 100644 --- a/gsk/meson.build +++ b/gsk/meson.build @@ -60,6 +60,7 @@ gsk_public_headers = files([ ]) install_headers(gsk_public_headers, 'gsk.h', subdir: 'gtk-4.0/gsk') + gsk_public_gl_headers = files([ 'gl/gskglrenderer.h' ]) @@ -69,14 +70,20 @@ gsk_public_headers += gsk_public_gl_headers gsk_public_broadway_headers = files([ 'broadway/gskbroadwayrenderer.h' ]) -install_headers(gsk_public_broadway_headers, subdir: 'gtk-4.0/gsk/broadway') -gsk_public_headers += gsk_public_broadway_headers + +if get_variable('broadway_enabled') + install_headers(gsk_public_broadway_headers, subdir: 'gtk-4.0/gsk/broadway') + gsk_public_headers += gsk_public_broadway_headers +endif gsk_public_vulkan_headers = files([ 'vulkan/gskvulkanrenderer.h' ]) -install_headers(gsk_public_vulkan_headers, subdir: 'gtk-4.0/gsk/vulkan') -gsk_public_headers += gsk_public_vulkan_headers + +if have_vulkan + install_headers(gsk_public_vulkan_headers, subdir: 'gtk-4.0/gsk/vulkan') + gsk_public_headers += gsk_public_vulkan_headers +endif gsk_private_vulkan_shaders = [] # This is an odd split because we use configure_file() below to workaround -- 2.30.2